testsuite: Tell meson we use TAP

This makes meson actually parse the individual test
results. Most of the time, it does not make a difference,
but one case where it does is when all the individual
tests of a binary are skipped, meson will mark the
test as skipped.

diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
index cfb45562cfdc74cad153fa5f3bb3a0b9b4ee7bb5..57daf3e72c9f253463f6d587610859bfa2f08538 100644 (file)
--- a/testsuite/a11y/meson.build
+++ b/testsuite/a11y/meson.build
@@ -52,6 +52,7 @@ foreach t: a11y_state_tests
   test (t + ' state',
     a11y_dump_bin,
     args: [ '--tap', '-k', ui_path ],
+    protocol: 'tap',
     env: [
       'GIO_USE_VOLUME_MONITOR=unix',
       'GSETTINGS_BACKEND=memory',
@@ -86,6 +87,7 @@ foreach t: a11y_tests
                     install_dir: testexecdir,
                     dependencies: libgtk_dep),
         args: [ '--tap', '-k', ],
+        protocol: 'tap',
         timeout: 120,
         env: [ 'GIO_USE_VOLUME_MONITOR=unix',
                'GSETTINGS_BACKEND=memory',

diff --git a/testsuite/css/change/meson.build b/testsuite/css/change/meson.build
index 5398e5da443c80ea3f828f4bbcb36b35943cca1c..1d5e6dc7c64c53fdbe5dae64b2405b321b16d088 100644 (file)
--- a/testsuite/css/change/meson.build
+++ b/testsuite/css/change/meson.build
@@ -11,6 +11,7 @@ test_change = executable(
 )
 test('change', test_change,
      args: [ '--tap', '-k' ],
+     protocol: 'tap',
      env: [ 'GIO_USE_VOLUME_MONITOR=unix',
             'GSETTINGS_BACKEND=memory',
             'GDK_DEBUG=default-settings',

diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build
index 43f7a100d01a1713fa51a6c111c4205d7a843c59..04bda160934b1efcf02e0127ead984f8e4c104e7 100644 (file)
--- a/testsuite/css/meson.build
+++ b/testsuite/css/meson.build
@@ -13,6 +13,7 @@ test_api = executable('api', 'api.c',
                       install_dir: testexecdir)
 test('api', test_api,
      args: ['--tap', '-k' ],
+     protocol: 'tap',
      env: [ 'GIO_USE_VOLUME_MONITOR=unix',
             'GSETTINGS_BACKEND=memory',
             'GDK_DEBUG=default-settings',
@@ -31,6 +32,7 @@ test_data = executable('data', ['data.c', '../../gtk/css/gtkcssdataurl.c'],
                        install_dir: testexecdir)
 test('data', test_data,
      args: ['--tap', '-k' ],
+     protocol: 'tap',
      env: [ 'GIO_USE_VOLUME_MONITOR=unix',
             'GSETTINGS_BACKEND=memory',
             'GDK_DEBUG=default-settings',

diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build
index 264ff588478649dc4f8bfae2bd910c543c5917de..264da0910078d759ed09722866e015a06222ed55 100644 (file)
--- a/testsuite/css/nodes/meson.build
+++ b/testsuite/css/nodes/meson.build
@@ -8,6 +8,7 @@ test_nodes = executable('test-css-nodes', 'test-css-nodes.c',
                         dependencies: libgtk_dep)
 test('nodes', test_nodes,
      args: [ '--tap', '-k' ],
+     protocol: 'tap',
      env: [ 'GIO_USE_VOLUME_MONITOR=unix',
             'GSETTINGS_BACKEND=memory',
             'GDK_DEBUG=default-settings',

diff --git a/testsuite/css/parser/meson.build b/testsuite/css/parser/meson.build
index ea4b815a591d40e24760e6f1add9af7a39c81797..31acfb23fbb646ad71e73b98dd887c5cc910bf44 100644 (file)
--- a/testsuite/css/parser/meson.build
+++ b/testsuite/css/parser/meson.build
@@ -465,6 +465,7 @@ foreach testname : test_data
                  '-k',
                  join_paths(meson.current_source_dir(), testname),
                ],
+         protocol: 'tap',
          env: [ 'GIO_USE_VOLUME_MONITOR=unix',
                 'GSETTINGS_BACKEND=memory',
                 'GDK_DEBUG=default-settings',

diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build
index efc635b44a45f2531cb0338077b1532537c5126b..0006359f9a3ddcc9d151063c8b7af6c79292a33f 100644 (file)
--- a/testsuite/css/style/meson.build
+++ b/testsuite/css/style/meson.build
@@ -18,6 +18,7 @@ test_style = executable(
 )
 test('style', test_style,
      args: [ '--tap', '-k' ],
+     protocol: 'tap',
      env: [ 'GIO_USE_VOLUME_MONITOR=unix',
             'GSETTINGS_BACKEND=memory',
             'GDK_DEBUG=default-settings',

diff --git a/testsuite/gdk/meson.build b/testsuite/gdk/meson.build
index 9afd0ca009674d4e47536638e5d6699466d1908e..69d6481490e86a9217ea6d0282d6dc0e44f34192 100644 (file)
--- a/testsuite/gdk/meson.build
+++ b/testsuite/gdk/meson.build
@@ -21,6 +21,7 @@ foreach t : tests
 
   test(t, test_exe,
        args: [ '--tap', '-k' ],
+       protocol: 'tap',
        env: [ 'GIO_USE_VOLUME_MONITOR=unix',
               'GSETTINGS_BACKEND=memory',
               'GDK_DEBUG=default-settings',

diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index 8c4706f67e0d2f095450ae2566948f14d4b7fd64..e9fdc661b71d64882e6f9bc84abab0140d5a4c30 100644 (file)
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -205,6 +205,7 @@ foreach t : tests
 
   test(test_name, test_exe,
        args: [ '--tap', '-k' ],
+       protocol: 'tap',
        env: [ 'GIO_USE_VOLUME_MONITOR=unix',
               'GSETTINGS_BACKEND=memory',
               'GDK_DEBUG=default-settings',

diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
index 254361e3eabeb35017b6eea432d710c581ba9027..19a44e798706f64f949fae36fa3acb43e57b8e18 100644 (file)
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -109,6 +109,7 @@ foreach t : tests
 
   test(test_name, test_exe,
        args: [ '--tap', '-k' ],
+       #protocol: 'tap',
        env: [ 'GIO_USE_VOLUME_MONITOR=unix',
               'GSETTINGS_BACKEND=memory',
               'GDK_DEBUG=default-settings',
@@ -134,6 +135,7 @@ if add_languages('cpp', required: false)
                         install_dir: testexecdir)
   test('c++ keywords', test_exe,
        args: [ '--tap', '-k' ],
+       #protocol: 'tap',
        env: [ 'GIO_USE_VOLUME_MONITOR=unix',
               'GSETTINGS_BACKEND=memory',
               'GDK_DEBUG=default-settings',

diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index a7d77fe17258b80dd9100df5d10c319d3817b512..3a3706d51bb741ee294aac158962f7d60df74eb3 100644 (file)
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -439,6 +439,7 @@ foreach testname : testdata
                  '-o', join_paths(meson.current_build_dir(), 'output'),
                  join_paths(meson.current_source_dir(), testname),
          ],
+         protocol: 'tap',
          env: [ 'GIO_USE_VOLUME_MONITOR=unix',
                 'GSETTINGS_BACKEND=memory',
                 'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir),